Skip to content

[WIP] Changes the way columns and patches are identified #7790

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Draft
wants to merge 28 commits into
base: master
Choose a base branch
from
Draft

[WIP] Changes the way columns and patches are identified #7790

wants to merge 28 commits into from

Conversation

@bishtgautam
Copy link
Contributor

@bishtgautam bishtgautam commented Oct 13, 2025 •
edited
Loading

Presently, the way a column or a patch is identified is whether they are associated with natural vegetation
or crop is to look at the landunit type.

    do c = bounds%begc,bounds%endc
       l = col_pp%landunit(c)
       
       ! Is this column a soil or a crop?
       if (lun_pp%itype(l) == istsoil .or. lun_pp%itype(l) == istcrop) then
          ! Do something on this 'c' 
       endif
      end do

    do p = bounds%begp,bounds%endp
       l = veg_pp%landunit(p)
       
       # Is the vegetation associated with soil (==natural vegetation) or a crop?
       if (lun_pp%itype(l) == istsoil .or. lun_pp%itype(l) == istcrop) then
          ! Do something for this 'p'
       endif
      end do

This PR does the following :

  • Adds new members to col_pp:
    • is_soil
    • is_crop
    • is_lake
  • Add new members toveg_pp
    • is_on_soil_col
    • is_on_crop_col
  • Using these new code changes allows the do-loops to be such that one does not have to look at the landunit type:
    do c = bounds%begc,bounds%endc       

       ! Is this column a soil or a crop?
       if (col_pp%is_soil(c) .or. col_pp%is_crop(c)) then
          ! Do something on this 'c' 
       endif
      end do

    do p = bounds%begp,bounds%endp
       
       # Is the vegetation associated with soil (==natural vegetation) or a crop?
       if (veg_pp%is_on_soil_col(p) .or. veg_pp%is_on_crop_col(p)) then
          ! Do something for this 'p'
       endif
      end do

This change will help in the development of dynamic lake areas.

@bishtgautam
Removes execute permission on files
6b22c5b
@bishtgautam
Uses a locally defined variable for landunit index
0f4f6fe
@bishtgautam
Adds spaces to make it more consitent for future refactor
674d248
@bishtgautam
Fixes bug
ffe6382
@bishtgautam
Changes the check from landunit itype to column itype
21634c9
@bishtgautam
More changes the check from landunit itype to column itype
805da1b
@bishtgautam
Minor fix
b33d606
@bishtgautam
Even more changes the check from landunit itype to column itype
fa2716b
@bishtgautam
Adds code to set if column is soil or crop
e65480b
@bishtgautam
Changes to use logicals
fa2bdb6
@bishtgautam
More code changes to use logicals
4c52802
@bishtgautam
Changes few biophysics code changes to use logicals
496da88
@bishtgautam
Fixes the setting of logicals
df8ac72
@bishtgautam
Changes more biophysics code changes to use logicals
497d1c5
@bishtgautam
Changes remaining code changes to use logicals
4d8d845
@bishtgautam
Adds code to set if veg is on a soil or crop column
2ccaff4
@bishtgautam
Adds biogeochem code changes to use veg_pp logicals
b852aa9
@bishtgautam
Adds biogeophys code changes to use veg_pp logicals
46ace91
@bishtgautam
More code changes to use veg_pp logicals
152ae40
@bishtgautam
Deletes changes that are not needed
e30b522
@bishtgautam
Changes few not conditional comparisions
84ed5f0
@bishtgautam
Even more changes to use logicals
d847e09
@bishtgautam
Adds new member to identify if the column is a lake
5a9e703
@bishtgautam
Uses logicals for lake columns
412e8fe
@bishtgautam
Look at soil column instead of landunit for determining lake or not
2b358a9
@bishtgautam
Removes the not needed check on landunit type
8a358fd
@bishtgautam
More changes to identify lake columns
09420fe
@bishtgautam
Updates identification of crop patches and columns
f8dce5f
@aldivi
Copy link
Contributor

aldivi commented Oct 21, 2025

@bishtgautam I don't see any obvious conflicts with the E3SM-GCAM code, although I am not sure if you are comparing with the current master, which includes the E3SM-GCAM code. Most of these files were not touched by adding the human component. The init and restart files appear not to change any land level weighting. As long as the new check functions the same as the old one, and all of the code controlled by it functions the same, I don't think it should be an issue.
I did find the 'lun_pp%itype(l) == istsoil' check in iac2lndMod that needs to be updated. I did not find any other of these checks related to the E3SM-GCAM code in the current master.

@bishtgautam
Copy link
Contributor Author

bishtgautam commented Oct 21, 2025

After a few open land-related PRs are merged, I will rebase this PR off the master.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@bishtgautam @aldivi